From: Glenn Morris <rgm@gnu.org>
Date: Thu, 26 Apr 2007 19:42:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~534^2~5^2~293
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a6fd9c662ba12bb92fb84c77b289d1331a2dc56c;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2e3beaa2d7..0c8df93080a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-26  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/python.el: Restore file pending consideration of legal
+	status.
+
 2007-04-26  Luc Teirlinck  <teirllm@dms.auburn.edu>
 
 	* locate.el (locate-in-alternate-database): Doc fix.
@@ -28,6 +33,10 @@
 
 	* custom.el (defface): Doc fix.
 
+2007-04-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* python.el: Remove due to unclear legal issues.
+
 2007-04-24  J.D. Smith  <jdsmith@as.arizona.edu>
 
 	* progmodes/idlw-shell.el (idlwave-shell-clear-all-bp): Don't